x11: Don't follow dpi and scale from xsettings when GDK_SCALE set
authorAlexander Larsson <alexl@redhat.com>
Mon, 1 Jul 2013 18:50:44 +0000 (20:50 +0200)
committerAlexander Larsson <alexl@redhat.com>
Wed, 3 Jul 2013 12:36:05 +0000 (14:36 +0200)
commit867ba1df27b9ed27d2d3ed6d43b536484635da18
tree3489dd78a3ac3ea3a3453a6b818beb9c846f1143
parent4b9c08f48d6f5be43b0795d3eee462d60b5f9e1f
x11: Don't follow dpi and scale from xsettings when GDK_SCALE set

If things are hardcoded in the environment, that wins.
gdk/x11/gdkscreen-x11.c
gdk/x11/gdkscreen-x11.h
gdk/x11/gdkwindow-x11.c
gdk/x11/xsettings-client.c